Fixed abort
Speed improvement on local vars