More changes - fix to google maps key. Fixed few bugs