some map bugs #498