More updates

I just need to sort the paginators out later and I think it's then all done for me.