Tab's fix for nextmap changes

Should provide smooth map transitions now, will need to remove all the work-around code from before. Scoring should now work fine on its own, but should test that.