fix errors interface
new files
merge