FINAL PUSH BEFORE VERSION 1.1 (REAL EDITION)

bug fixes with mapView