Fixes and add sounds