fixed caljac and some angular poo