Issue #88 Fix Docblock issues

part 7