Fixes some issues, and is now playing sounds
Just some clean up