more work cleaning things up for finish