Fixed up some questions