multi choice and other fixes