dependecy update and resultig bug fixes