Modern Objective C cont.

Thanks for merging the other changes!

Here are some more clean up. For the "Use properties" commits, I only changed ivars where we created getters/setters, if you prefer I can change them all.