mediocre improvements from peter

just one new file for you, thanks.