Docblock fixes and more dependency injection