Replaced (most) iVars by properties.
Some cleanup.