Minor fixes, and story progress