Added more angular stuff and actions fixes