Clean up usage, TODO.
Merge pull request #2 from mdshw5/master

Clean up usage, TODO.