Sound upgrades

Bats still suck
Merge #1321321451

Conflicts:
	Fuck you