A couple bugfixes
upgrade to gmaps v3 and some refactoring (still ugly though)