Fixed a few bugs with questions