Cleanup output and add more cases.
Update version.