Ethan - the reason this isn't working is because the commands all expect an argument. See the `\s+` part of the regex. It means there MUST be white space after the command. The other bare commands all just ignore the last word. It's not great, so perhaps the regex should be split in two.

If you want a crack at this, go for it. I'll look at it tomorrow otherwise.