add reports routine, improve dependency injection routines, minor fixes