major fixes: working with $words in angular