Fixes and adding auto-numbering special syntax