Many Updates to the maps and script fixes

This is in prep for the next demo update