more small changes resulting from fiddling with Angular