added more support for angular js and cjanged some settings