Removed extra questions, added a few