improving tomdoc