lots of cleaning up, almost done now