bug fixes
added google maps markers and fixed cross-browser incompatabilities
simple merge