Corrections
Fixing up some of the terms and property names