First patch, - overall fixes and improvements
Dependency upd