Update module to new version , fix bugs and improve map