fixed up various bits n bobs