Parser extensions and fixes

Includes:

* Parens optional for containers, parse english words as amounts
* Container amount separator can have a dash