heaps more stuff for 1.6.1