code v1.3 and docblocks refined