[cvs-nhc98] Merge all of Thorsten's recent tool updates from the CVS h