Minor Changes in Iterator and MapGlassPane to comply with stuff