some fixes
Merge branch 'present' of github.com:lo-cszeto/angular-exp into present