more clean up and fixes