assorted programme fixes