added token support and bug fixes

* support token
* checks un-assed value
* format help