Added roof, some fixes.