Some method merges and documentation additions.