Add ctor, fix accessors, add notes