diff --git a/raylib.ads b/raylib.ads
index fc41f57..edb117d 100644
--- a/raylib.ads
+++ b/raylib.ads
@@ -858,6 +858,8 @@ package Raylib is
 		Frame_Count : Natural      := 0;
 	end record with Convention => C_Pass_By_Copy;
 
+	No_Sound : Sound;
+
 	type Music is record
 		Stream       : Audio_Stream := No_Audio_Stream;
 		Frame_Count  : Natural      := 0;
@@ -1891,9 +1893,7 @@ package Raylib is
 		--~Import        => True,
 		--~Convention    => C,
 		--~External_Name => "PlayAutomationEvent";
---~################################################################
---~################################################################
---~################################################################
+
 	function Is_Key_Pressed (
 		Key : Keyboard_Key := Key_Null
 	) return Logical with
@@ -1996,75 +1996,94 @@ package Raylib is
 		--~Convention    => C,
 		--~External_Name => "";
 
-	--~function bool IsMouseButtonPressed (int button) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Is_Mouse_Button_Pressed (
+		Button : Mouse_Button := Mouse_Button_Left
+	) return Logical with
+		Import        => True,
+		Convention    => C,
+		External_Name => "IsMouseButtonPressed";
 
-	--~function bool IsMouseButtonDown (int button) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Is_Mouse_Button_Down (
+		Button : Mouse_Button := Mouse_Button_Left
+	) return Logical with
+		Import        => True,
+		Convention    => C,
+		External_Name => "IsMouseButtonDown";
 
-	--~function bool IsMouseButtonReleased (int button) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Is_Mouse_Button_Released (
+		Button : Mouse_Button := Mouse_Button_Left
+	) return Logical with
+		Import        => True,
+		Convention    => C,
+		External_Name => "IsMouseButtonReleased";
 
-	--~function bool IsMouseButtonUp (int button) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Is_Mouse_Button_Up (
+		Button : Mouse_Button := Mouse_Button_Left
+	) return Logical with
+		Import        => True,
+		Convention    => C,
+		External_Name => "IsMouseButtonUp";
 
-	--~function int GetMouseX (void) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Get_Mouse_X return Integer with
+		Import        => True,
+		Convention    => C,
+		External_Name => "GetMouseX";
 
-	--~function int GetMouseY (void) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Get_Mouse_Y return Integer with
+		Import        => True,
+		Convention    => C,
+		External_Name => "GetMouseY";
 
-	--~function Vector2 GetMousePosition (void) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Get_Mouse_Position return Vector_2D with
+		Import        => True,
+		Convention    => C,
+		External_Name => "GetMousePosition";
 
-	--~function Vector2 GetMouseDelta (void) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Get_Mouse_Delta return Vector_2D with
+		Import        => True,
+		Convention    => C,
+		External_Name => "GetMouseDelta";
 
-	--~procedure SetMousePosition (int x, int y) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Set_Mouse_Position (
+		X : Integer := 0;
+		Y : Integer := 0
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "SetMousePosition";
 
-	--~procedure SetMouseOffset (int offsetX, int offsetY) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Set_Mouse_Offset (
+		X : Integer := 0;
+		Y : Integer := 0
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "SetMouseOffset";
 
-	--~procedure SetMouseScale (float scaleX, float scaleY) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Set_Mouse_Scale (
+		X : Float := 0.0;
+		Y : Float := 0.0
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "SetMouseScale";
 
-	--~function float GetMouseWheelMove (void) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Get_Mouse_Wheel_Move return Float with
+		Import        => True,
+		Convention    => C,
+		External_Name => "GetMouseWheelMove";
 
-	--~function Vector2 GetMouseWheelMoveV (void) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Get_Mouse_Wheel_Move_V return Vector_2D with
+		Import        => True,
+		Convention    => C,
+		External_Name => "GetMouseWheelMoveV";
 
-	--~procedure SetMouseCursor (int cursor) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Set_Mouse_Cursor (
+		Cursor : Mouse_Cursor := Mouse_Cursor_Default
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "SetMouseCursor";
 
 	--~function int GetTouchX (void) with
 		--~Import        => True,
@@ -2929,8 +2948,6 @@ package Raylib is
 		Convention    => C,
 		External_Name => "DrawTexturePro";
 
-	--~RLAPI void DrawTexturePro(Texture2D texture, Rectangle source, Rectangle dest, Vector2 origin, float rotation, Color tint);
-
 	--~procedure DrawTextureNPatch (Texture2D texture, NPatchInfo nPatchInfo, Rectangle dest, Vector2 origin, float rotation, Color tint) with
 		--~Import        => True,
 		--~Convention    => C,
@@ -3016,10 +3033,12 @@ package Raylib is
 		Convention    => C,
 		External_Name => "GetFontDefault";
 
-	--~function Font LoadFont (const char *fileName) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Load_Font (
+		File_Name : String := ""
+	) return Font with
+		Import        => True,
+		Convention    => C,
+		External_Name => "LoadFont";
 
 	--~function Font LoadFontEx (const char *fileName, int fontSize, int *codepoints, int codepointCount) with
 		--~Import        => True,
@@ -3056,10 +3075,12 @@ package Raylib is
 		--~Convention    => C,
 		--~External_Name => "";
 
-	--~procedure UnloadFont (Font font) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Unload_Font (
+		Data : Font := No_Font
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "UnloadFont";
 
 	--~function bool ExportFontAsCode (Font font, const char *fileName) with
 		--~Import        => True,
@@ -3073,9 +3094,7 @@ package Raylib is
 		Import        => True,
 		Convention    => C,
 		External_Name => "DrawFPS";
---~################################################################
---~################################################################
---~################################################################
+
 	procedure Draw_Text (
 		Text : String  := "";
 		--~Text : access String  := null;
@@ -3096,7 +3115,7 @@ package Raylib is
 
 	procedure Draw_Text_Pro (
 		Data      : Font      := Get_Font_Default;
-		Text      : String    := "NOOO";
+		Text      : String    := "";
 		Position  : Vector_2D := (0.0, 0.0);
 		Origin    : Vector_2D := (0.0, 0.0);
 		Rotation  : Float     := 0.0;
@@ -3638,15 +3657,15 @@ package Raylib is
 		--~Convention    => C,
 		--~External_Name => "";
 
-	--~procedure InitAudioDevice (void) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Open_Audio_Device with
+		Import        => True,
+		Convention    => C,
+		External_Name => "InitAudioDevice";
 
-	--~procedure CloseAudioDevice (void) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Close_Audio_Device with
+		Import        => True,
+		Convention    => C,
+		External_Name => "CloseAudioDevice";
 
 	--~function bool IsAudioDeviceReady (void) with
 		--~Import        => True,
@@ -3678,10 +3697,12 @@ package Raylib is
 		--~Convention    => C,
 		--~External_Name => "";
 
-	--~function Sound LoadSound (const char *fileName) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	function Load_Sound (
+		File_Name : String := ""
+	) return Sound with
+		Import        => True,
+		Convention    => C,
+		External_Name => "LoadSound";
 
 	--~function Sound LoadSoundFromWave (Wave wave) with
 		--~Import        => True,
@@ -3708,10 +3729,12 @@ package Raylib is
 		--~Convention    => C,
 		--~External_Name => "";
 
-	--~procedure UnloadSound (Sound sound) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Unload_Sound (
+		Data : Sound := No_Sound
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "UnloadSound";
 
 	--~procedure UnloadSoundAlias (Sound alias) with
 		--~Import        => True,
@@ -3728,25 +3751,33 @@ package Raylib is
 		--~Convention    => C,
 		--~External_Name => "";
 
-	--~procedure PlaySound (Sound sound) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Play_Sound (
+		Data : Sound := No_Sound
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "PlaySound";
 
-	--~procedure StopSound (Sound sound) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Stop_Sound (
+		Data : Sound := No_Sound
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "StopSound";
 
-	--~procedure PauseSound (Sound sound) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Pause_Sound (
+		Data : Sound := No_Sound
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "PauseSound";
 
-	--~procedure ResumeSound (Sound sound) with
-		--~Import        => True,
-		--~Convention    => C,
-		--~External_Name => "";
+	procedure Resume_Sound (
+		Data : Sound := No_Sound
+	) with
+		Import        => True,
+		Convention    => C,
+		External_Name => "ResumeSound";
 
 	--~function bool IsSoundPlaying (Sound sound) with
 		--~Import        => True,