added and tweaked several doctags