updates dependencies, and some cleaning
merge changes