Fixes controlls while paused and more
Merges