use forceSwitchWith instead of then, minor fixes