optimizations and corrections,

correct ',' not continuing to next line
correct '&' can trail numerics
correct ']' can trail numerics in expression mode
optimize regex for EOL

Author: msftrncs