Fixed capitalization issues

Wasn't parsing correctly before, as some items were not capitalized correctly.