add company questions and update TODO