final bits and bobs hopefully