some new files, some fixes