new files and minor fixes