More testing and fixed capitalization fuck up

Seems I went ahead and munged the capitalization for half of the file.