new files and old fixes