added angular and tons of other fixes