Assorted Changes + World Map added