Fixed lots of angular issues