drawmap fixes