more clean up, added reporting