Fixes, some temp removals of stuff, removed sounds.