fix + add comments for docco