SoundMan + fixes
Merge stuff