update dependencies, DependencyInjection routines, minor fixes