fixed bugs and added google maps