handle labels without rolls
fixed label regex to pick up 1 char labels; added brackets
allow all brackets in labels; remove space after label