WIP: updated the regex to handle comments and parse arguments separately