A load of docblock fixes