Assorted updates

Would probably be good to review the changes and see what's mergable