Merge with Jason changes and feedback changes, mostly to the map
Final changes