some minor fixes, gmaps still not working, failing 4 tests