cleaning up a bit, work in progress