Updated angular, plus other changes