Batch of model changes, docblock improvements