formatting updates, help updates, option handling updates.
Merge pull request #2 from Paulinka/master

formatting updates, help updates, option handling updates.