various bits and bobs
merge