fixes for question and answer