chg: incorporate some suggestions by Hans