lots of minor fixes and updating angular