Fixed bugs 2572 and switching times questions.