Issue G#88 Fix Docblock issues

part 3