2 improvements from dolmen
cleanup, stuff that had not been commited previously
fixed RT # 96009