diff --git a/.vscode/launch.json b/.vscode/launch.json
index 78d5a413..d5714ea7 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,7 +1,5 @@
 {
-    // Use o IntelliSense para saber mais sobre os atributos possíveis.
-    // Focalizar para exibir as descrições dos atributos existentes.
-    // Para obter mais informações, acesse: https://go.microsoft.com/fwlink/?linkid=830387
+
     "version": "0.2.0",
     "configurations": [
         {
diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
index 32e9b6f6..c88fd1fb 100644
--- a/app/controllers/AuthController.php
+++ b/app/controllers/AuthController.php
@@ -28,6 +28,7 @@ class AuthController
     {
         $body = json_decode($request->getBody()->getContents(), true);
 
+        // wrong/no credentials - START
         if (empty($body['senha']) || empty($body['email'])) {
             $response->getBody()->write(json_encode(
                 [
@@ -44,11 +45,14 @@ class AuthController
             $response->getBody()->write(json_encode(['status' => false, 'data' => ["message" => "Usuario e senha nao confere, por favor verifique as informacoes passadas!"]]));
             return $response;
         }
+        // wrong/no credentials - END
 
         $expiredat = (new \DateTime())->modify('+1 days')->format('Y-m-d H:i:s');
         $tokenPayload = ['sub' => $usuario->id, 'name' => $usuario->nome, 'email' => $usuario->email, 'expired_at' => $expiredat];
-        $tokens = Token::find(["id_usuario" => $usuario->id]);
 
+        // If token's expired: delete it and create another one
+        // else: just return it
+        $tokens = Token::find(["id_usuario" => $usuario->id]);
         if ($tokens) {
             $expiredDate = new DateTime($tokens->expired_at);
             $now = new DateTime();
diff --git a/app/controllers/MeetController.php b/app/controllers/MeetController.php
index 622e7dd1..432f76aa 100644
--- a/app/controllers/MeetController.php
+++ b/app/controllers/MeetController.php
@@ -30,7 +30,7 @@ class MeetController
             $this->serverRequest();
             $body = json_decode($request->getBody()->getContents(), true);
 
-            $data = [];
+            $data = []; // this array is never populated??
             $dados['org_id'] = $body['org_id'];
             $dados['meet_id'] = $body['data']['roomName'];
             $dados['nome'] = $body['data']['roomName'];
@@ -49,7 +49,7 @@ class MeetController
             }
             $p = MeetPeople::create($people);
 
-            if ($data) {
+            if ($data) { // will it allways be falsy?
                 $response->getBody()->write(json_encode(['status' => true, 'data' => ['meet' => ['created' => $meet ?? 'OK'], 'user' => ['join' => $p ?? 'yes']]]));
             } else {
                 $response->getBody()->write(json_encode(['status' => false, 'data' => $data]));
diff --git a/app/middleware/AuthMiddleware.php b/app/middleware/AuthMiddleware.php
index 3fcf2c1b..b2d3a4df 100644
--- a/app/middleware/AuthMiddleware.php
+++ b/app/middleware/AuthMiddleware.php
@@ -15,6 +15,7 @@ class AuthMiddleware
     public function __invoke(Request $request, RequestHandler $handler): ResponseInterface
     {
         try {
+            //returns [user_id, token_id, id_organizacao, token, expired_at] if not found --> throws exception
             $this->findToken($request);
             $response = $handler->handle($request);
         } catch (Exception $e) {
diff --git a/app/traits/AuthToken.php b/app/traits/AuthToken.php
index 87b9ab4f..62546869 100644
--- a/app/traits/AuthToken.php
+++ b/app/traits/AuthToken.php
@@ -25,8 +25,8 @@ trait AuthToken
 
         $tokenEmpresa = Token::query(
             "SELECT pu.id as user_id, t.id as token_id, pou.id_organizacao, t.token, t.expired_at
-                FROM pbx_usuarios pu 
-                INNER JOIN pbx_tokens t ON t.id_usuario = pu.id 
+                FROM pbx_usuarios pu
+                INNER JOIN pbx_tokens t ON t.id_usuario = pu.id
                 INNER JOIN pbx_organizacao_usuarios pou ON pou.id_usuario = pu.id
                 WHERE t.token = :token AND id_organizacao = :org_id;",
             ["token" => $bearerToken, 'org_id' => $body['org_id']]
diff --git a/public/api.php b/public/api.php
index 8963827a..b57c08e2 100644
--- a/public/api.php
+++ b/public/api.php
@@ -2,8 +2,8 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-// error_reporting(E_ALL);
-// ini_set('display_errors', 1);
+//error_reporting(E_ALL);
+ini_set('display_errors', 0);
 
 use app\controllers\QueueController;
 use app\controllers\CallController;
@@ -21,10 +21,11 @@ header("Access-Control-Allow-Methods: HEAD, GET, POST, PUT, PATCH, DELETE, OPTIO
 header("Access-Control-Allow-Headers: X-API-KEY, Origin, ngrok-skip-browser-warning, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Request-Headers, Authorization");
 header('Content-Type: application/json');
 $method = $_SERVER['REQUEST_METHOD'];
-if ($method == "OPTIONS") {
-    header("HTTP/1.1 200 OK");
+/*if ($method == "OPTIONS") {
+    echo "teste OK";
+    //  header("HTTP/1.1 200 OK");
     die();
-}
+}*/
 
 $app = AppFactory::create();
 $app->addRoutingMiddleware();