Sound fixes and stuff