Refactored terrain display, new terrain types