tidied up some stashed changes