Undid collisions manually, because I cannot into git.
- fixed sound volume not setting
- fixed configurable controls