Update MapKit.java

More bug fixes