stripped out chosen settings, updated more dependencies