diff --git a/src/pages/api/albums/list.ts b/src/pages/api/albums/list.ts
index a3a7c2d..97df105 100644
--- a/src/pages/api/albums/list.ts
+++ b/src/pages/api/albums/list.ts
@@ -83,5 +83,5 @@ export default async function handler(
     .orderBy(desc(albums.createdAt));
   
   const sortedAlbums = sortAlbums(dbAlbums as IAlbum[], sortBy, sortOrder);
-  res.status(200).json(dbAlbums);
+  res.status(200).json(sortedAlbums);
 }
\ No newline at end of file
diff --git a/src/pages/api/albums/potential-albums-assets.ts b/src/pages/api/albums/potential-albums-assets.ts
index 51befd0..75c98c2 100644
--- a/src/pages/api/albums/potential-albums-assets.ts
+++ b/src/pages/api/albums/potential-albums-assets.ts
@@ -24,12 +24,12 @@ const SELECT_ORPHAN_PHOTOS = (date: string, ownerId:  string) =>
       e."dateTimeOriginal",
       e."orientation"
   FROM 
-      assets a
+      asset a
   LEFT JOIN 
-      albums_assets_assets aaa 
+      album_asset aaa 
       ON a.id = aaa."assetsId"
   LEFT JOIN 
-      exif e 
+      asset_exif e 
       ON a.id = e."assetId"
   WHERE 
       aaa."albumsId" IS NULL 
@@ -58,6 +58,7 @@ export default async function handler(
     });
     return res.status(200).json(cleanedRows);
   } catch (error: any) {
+    console.error(error);
     res.status(500).json({
       error: error?.message,
     });
diff --git a/src/pages/api/albums/potential-albums-dates.ts b/src/pages/api/albums/potential-albums-dates.ts
index 3cb737a..47a5c25 100644
--- a/src/pages/api/albums/potential-albums-dates.ts
+++ b/src/pages/api/albums/potential-albums-dates.ts
@@ -45,6 +45,7 @@ export default async function handler(
     }
     return res.status(200).json(filteredRows);
   } catch (error: any) {
+    console.error(error);
     res.status(500).json({
       error: error?.message,
     });
diff --git a/src/pages/api/users/me.ts b/src/pages/api/users/me.ts
index 21b6b8b..e949600 100644
--- a/src/pages/api/users/me.ts
+++ b/src/pages/api/users/me.ts
@@ -1,7 +1,4 @@
-// pages/api/proxy.js
-
 import { db } from "@/config/db";
-import { ENV } from "@/config/environment";
 import { getCurrentUser } from "@/handlers/serverUtils/user.utils";
 import { NextApiRequest, NextApiResponse } from "next";
 
diff --git a/src/schema/albumAssetsAssets.schema.ts b/src/schema/albumAssetsAssets.schema.ts
index 8d118c0..5970197 100644
--- a/src/schema/albumAssetsAssets.schema.ts
+++ b/src/schema/albumAssetsAssets.schema.ts
@@ -1,6 +1,6 @@
 import { pgTable, uuid, timestamp } from 'drizzle-orm/pg-core';
 
-export const albumsAssetsAssets = pgTable('albums_assets_assets', {
+export const albumsAssetsAssets = pgTable('album_asset', {
   albumsId: uuid('albumsId').notNull(),
   assetsId: uuid('assetsId').notNull(),
   createdAt: timestamp('createdAt', { withTimezone: true }).defaultNow().notNull(),
diff --git a/src/schema/albums.schema.ts b/src/schema/albums.schema.ts
index f1ae628..aed3f0c 100644
--- a/src/schema/albums.schema.ts
+++ b/src/schema/albums.schema.ts
@@ -1,6 +1,6 @@
 import { pgTable, uuid, varchar, timestamp, boolean, text } from 'drizzle-orm/pg-core';
 
-export const albums = pgTable('albums', {
+export const albums = pgTable('album', {
     id: uuid('id').defaultRandom().primaryKey().notNull(),
     ownerId: uuid('ownerId').notNull(),
     albumName: varchar('albumName').notNull().default('Untitled Album'),
diff --git a/src/schema/assetFaces.schema.ts b/src/schema/assetFaces.schema.ts
index db8fb78..fd2c1ce 100644
--- a/src/schema/assetFaces.schema.ts
+++ b/src/schema/assetFaces.schema.ts
@@ -1,6 +1,6 @@
 import { pgTable, uuid, integer } from "drizzle-orm/pg-core";
 
-export const assetFaces = pgTable("asset_faces", {
+export const assetFaces = pgTable("asset_face", {
     id: uuid("id").defaultRandom().primaryKey(),
     assetId: uuid("assetId").notNull(),
     personId: uuid("personId"),
diff --git a/src/schema/assets.schema.ts b/src/schema/assets.schema.ts
index 791dac8..0f9b564 100644
--- a/src/schema/assets.schema.ts
+++ b/src/schema/assets.schema.ts
@@ -1,6 +1,6 @@
 import { pgTable, uuid, varchar, timestamp, boolean } from 'drizzle-orm/pg-core';
 
-export const assets = pgTable('assets', {
+export const assets = pgTable('asset', {
   id: uuid('id').defaultRandom().primaryKey().notNull(),
   deviceAssetId: varchar('deviceAssetId').notNull(),
   ownerId: uuid('ownerId').notNull(),
diff --git a/src/schema/exif.schema.ts b/src/schema/exif.schema.ts
index 367573b..75fa4c9 100644
--- a/src/schema/exif.schema.ts
+++ b/src/schema/exif.schema.ts
@@ -1,7 +1,7 @@
 import { pgTable, uuid, varchar, integer, bigint, timestamp, doublePrecision, text } from 'drizzle-orm/pg-core';
 import { assets } from './assets.schema'; // Assuming you have an assets table defined
 
-export const exif = pgTable('exif', {
+export const exif = pgTable('asset_exif', {
   assetId: uuid('assetId').primaryKey().notNull().references(() => assets.id, { onDelete: 'cascade' }),
   make: varchar('make'),
   model: varchar('model'),
diff --git a/src/schema/users.schema.ts b/src/schema/users.schema.ts
index 2b157d9..6c1ce40 100644
--- a/src/schema/users.schema.ts
+++ b/src/schema/users.schema.ts
@@ -1,6 +1,6 @@
 import { pgTable, uuid, varchar, timestamp, boolean, bigint } from "drizzle-orm/pg-core";
 
-export const users = pgTable("users", {
+export const users = pgTable("user", {
     id: uuid("id").defaultRandom().primaryKey(),
     email: varchar("email").notNull(),
     password: varchar("password").notNull().default(''),