cleaned up a number of things