moved more sentences & typing logic over to angularjs