bug fixes and trivia puzzel switch