Misc changes, AngularJS now functional