Refactoring accessors, updated docs
Misc notes/todo thoughts