added a ton of stuff
removed google maps for now