Fixed a few types and removed Cullen's comments