fixing some angular issues