more changes and i suck at angular :(