Fixed some questions