More addition of CML syntax to the TP and fixes to existing syntax