Replaced iVars with properties.
Some cleanup.