Fixed crash, use Dagger everywhere, minor changes