old fixes

Happy mergings of old things that I don't quite remember doing!