tweaked stuff added sounds
fix merge