Added some reminders/shortcuts. Odds and ends notes.
Refactored tests to be happy with Mitch's changes.