lots of cleaning up, mostly Janet