Added questions, fixed bugs