Fixes
Add sounds
comment some stuff
merge master