minor changes to context, login, config