More minor fixes/tweaks

Fix a bear bug, tidy scrolling code, add a flag to remove player restrictions.