added more support for angular js and changed some settings