map ready and minor fixes