Updated some map code and graphics