Fixed more switches. Moon, dragon and chaos tested successfully.