Moved some notes.

Tweak things for class.