Simplification and some bug fixes.
Improve usage information.