Cltrp fixes, now a lot faster.