fix and some new files