Code cleanup.
Changed most of the public ivars to private properties.  Haven't tested this--so if I've messed it up, go back to previous commit and work from there, maybe.