improve doku and printout