New syntax and better equation numbering