clean dependencies, improve syntax
update files
some fixes