small fixes + docco test