Renamed map to MapWidget to avoid confusion
Added Javadoc