revert AngularJS update and fixed a few other kinks