Additional manor fixes, added tundra