Clean up

Merge clean up, sounds added