some cleanup, file updates