Corrected the use of self in docblock and in some cases code.