Re-arranged map pieces. And added more.