Tons more little things. Map displays correct title, removed completed TODO comments, and more.