Singleplayer

Adding last singleplayer fixes to master