Cleanup
Fix sound and image loading