Fixed some logic, added logic for answering questions