Added Map, Added Preferences Window and User Defaults, ...