Docbloc improvements