Dependency injection in all controllers, bug fixes