Lots of improvements for angular