Fixed numbering of 35 and 36, did some more problems