cleaned up all sorts of stuff