Lots of fixes and removing angular