many changes to clean up files