diff --git a/projects/apis/vulkan/src/vulkan_result_converter.h b/projects/apis/vulkan/src/vulkan_result_converter.h
index 1059c22..a966a73 100644
--- a/projects/apis/vulkan/src/vulkan_result_converter.h
+++ b/projects/apis/vulkan/src/vulkan_result_converter.h
@@ -5,53 +5,54 @@
 static inline gnReturnCode VkResultToGnReturnCode(VkResult result) {
     switch (result) {
         case VK_SUCCESS: return GN_SUCCESS;
-        // case VK_NOT_READY: return ;
-        // case VK_TIMEOUT: return ;
-        // case VK_EVENT_SET: return ;
-        // case VK_EVENT_RESET: return ;
-        // case VK_INCOMPLETE: return ;
-        case VK_ERROR_OUT_OF_HOST_MEMORY: return GN_OUT_OUT_HOST_MEMEORY;
-        case VK_ERROR_OUT_OF_DEVICE_MEMORY: return GN_OUT_OUT_DEVICE_MEMORY;
+        case VK_NOT_READY: return GN_NOT_READY;
+        case VK_TIMEOUT: return GN_TIMEOUT;
+        case VK_EVENT_SET: return GN_UNKNOWN_ERROR;
+        case VK_EVENT_RESET: return GN_UNKNOWN_ERROR;
+        case VK_INCOMPLETE: return GN_INCOMPLETE;
+        case VK_ERROR_OUT_OF_HOST_MEMORY: return GN_OUT_OF_HOST_MEMEORY;
+        case VK_ERROR_OUT_OF_DEVICE_MEMORY: return GN_OUT_OF_DEVICE_MEMORY;
         case VK_ERROR_INITIALIZATION_FAILED: return GN_FAILED_CREATE_OBJECT;
-        // case VK_ERROR_DEVICE_LOST: return ;
-        // case VK_ERROR_MEMORY_MAP_FAILED: return ;
+        case VK_ERROR_DEVICE_LOST: return GN_DEVICE_LOST;
+        case VK_ERROR_MEMORY_MAP_FAILED: return GN_FAILED_MEMORY_MAP;
         case VK_ERROR_LAYER_NOT_PRESENT: return GN_UNLOADED_LAYER;
         case VK_ERROR_EXTENSION_NOT_PRESENT: return GN_UNLOADED_EXTENSION;
-        // case VK_ERROR_FEATURE_NOT_PRESENT: return ;
-        // case VK_ERROR_INCOMPATIBLE_DRIVER: return ;
-        // case VK_ERROR_TOO_MANY_OBJECTS: return ;
+        case VK_ERROR_FEATURE_NOT_PRESENT: return GN_UNSUPPORTED_FEATURE;
+        case VK_ERROR_INCOMPATIBLE_DRIVER: return GN_UNSUPPORTED_API;
+        case VK_ERROR_TOO_MANY_OBJECTS: return GN_OVERALLOCATION;
         case VK_ERROR_FORMAT_NOT_SUPPORTED: return GN_UNSUPPORTED_FORMAT;
-        // case VK_ERROR_FRAGMENTED_POOL: return ;
+        case VK_ERROR_FRAGMENTED_POOL: return GN_FRAGMENTATION;
         case VK_ERROR_UNKNOWN: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_OUT_OF_POOL_MEMORY: return ;
-        // case VK_ERROR_INVALID_EXTERNAL_HANDLE: return ;
-        // case VK_ERROR_FRAGMENTATION: return ;
-        // case VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS: return ;
-        // case VK_PIPELINE_COMPILE_REQUIRED: return ;
-        // case VK_ERROR_NOT_PERMITTED: return ;
-        // case VK_ERROR_SURFACE_LOST_KHR: return ;
-        // case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR: return ;
+        case VK_ERROR_OUT_OF_POOL_MEMORY: return GN_OUT_OF_POOL_MEMORY;
+        case VK_ERROR_INVALID_EXTERNAL_HANDLE: return GN_INVALID_HANDLE;
+        case VK_ERROR_FRAGMENTATION: return GN_FRAGMENTATION;
+        case VK_ERROR_INVALID_OPAQUE_CAPTURE_ADDRESS: return GN_UNKNOWN_ERROR;
+        case VK_PIPELINE_COMPILE_REQUIRED: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_NOT_PERMITTED: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_SURFACE_LOST_KHR: return GN_SURFACE_LOST;
+        case VK_ERROR_NATIVE_WINDOW_IN_USE_KHR: return GN_WINDOW_IN_USE;
         case VK_SUBOPTIMAL_KHR: return GN_SUBOPTIMAL_PRESENTATION_QUEUE;
         case VK_ERROR_OUT_OF_DATE_KHR: return GN_OUT_OF_DATE_PRESENTATION_QUEUE;
-        // case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR: return ;
-        // case VK_ERROR_VALIDATION_FAILED_EXT: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_INVALID_SHADER_NV: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT: return GN_UNKNOWN_ERROR;
-        // case VK_THREAD_IDLE_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_THREAD_DONE_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_OPERATION_DEFERRED_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_OPERATION_NOT_DEFERRED_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_COMPRESSION_EXHAUSTED_EXT: return GN_UNKNOWN_ERROR;
-        // case VK_INCOMPATIBLE_SHADER_BINARY_EXT: return GN_UNKNOWN_ERROR;
-        // case VK_PIPELINE_BINARY_MISSING_KHR: return GN_UNKNOWN_ERROR;
-        // case VK_ERROR_NOT_ENOUGH_SPACE_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_INCOMPATIBLE_DISPLAY_KHR: return GN_INCOMPATIBLE_DISPLAY;
+        case VK_ERROR_VALIDATION_FAILED_EXT: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_INVALID_SHADER_NV: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR: return GN_UNSUPPORTED_IMAGE_USE;
+        case VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_FULL_SCREEN_EXCLUSIVE_MODE_LOST_EXT: return GN_UNKNOWN_ERROR;
+        case VK_THREAD_IDLE_KHR: return GN_UNKNOWN_ERROR;
+        case VK_THREAD_DONE_KHR: return GN_UNKNOWN_ERROR;
+        case VK_OPERATION_DEFERRED_KHR: return GN_UNKNOWN_ERROR;
+        case VK_OPERATION_NOT_DEFERRED_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_COMPRESSION_EXHAUSTED_EXT: return GN_UNKNOWN_ERROR;
+        case VK_INCOMPATIBLE_SHADER_BINARY_EXT: return GN_UNKNOWN_ERROR;
+        case VK_PIPELINE_BINARY_MISSING_KHR: return GN_UNKNOWN_ERROR;
+        case VK_ERROR_NOT_ENOUGH_SPACE_KHR: return GN_UNKNOWN_ERROR;
+        case VK_RESULT_MAX_ENUM: return GN_UNKNOWN_ERROR;
     }
 }
diff --git a/projects/core/gryphn_return_code.h b/projects/core/gryphn_return_code.h
index ecdeade..561e606 100644
--- a/projects/core/gryphn_return_code.h
+++ b/projects/core/gryphn_return_code.h
@@ -6,11 +6,13 @@ typedef enum gnReturnCode {
 
     // non spec return codes
     GN_FAILED_CREATE_OBJECT, GN_FAILED_TO_ALLOCATE_OBJECT,
-    GN_FAILED_TO_ALLOCATE_MEMORY, GN_OUT_OUT_HOST_MEMEORY,
-    GN_OUT_OUT_DEVICE_MEMORY, GN_OUT_OF_DATE_PRESENTATION_QUEUE,
+    GN_FAILED_TO_ALLOCATE_MEMORY, GN_OUT_OF_HOST_MEMEORY, GN_OUT_OF_POOL_MEMORY,
+    GN_OUT_OF_DEVICE_MEMORY, GN_OUT_OF_DATE_PRESENTATION_QUEUE,
     GN_SUBOPTIMAL_PRESENTATION_QUEUE, GN_SURFACE_IN_USE, GN_UNSUPPORTED_FORMAT,
-    GN_FAILED_TO_FIND_ENTRY_POINT, GN_FAILED_TO_LOAD_FUNCTION,
-
+    GN_FAILED_TO_FIND_ENTRY_POINT, GN_FAILED_TO_LOAD_FUNCTION, GN_INCOMPLETE,
+    GN_NOT_READY, GN_TIMEOUT, GN_DEVICE_LOST, GN_FAILED_MEMORY_MAP, GN_UNSUPPORTED_FEATURE,
+    GN_OVERALLOCATION, GN_FRAGMENTATION, GN_INVALID_HANDLE, GN_SURFACE_LOST, GN_WINDOW_IN_USE,
+    GN_INCOMPATIBLE_DISPLAY, GN_UNSUPPORTED_IMAGE_USE,
 
     GN_UNLOADED_EXTENSION = -1,
     GN_UNLOADED_LAYER = -2,