Updates map code
Major Update
Updates for initial demo