some clean up and a few file updates