lots of clean up. and added entering of google maps