Small review fixups.
More review-fixes.
Updating to tivoka version.
Merge pull request #1 from Textalk/reviewFixes

Small review fixups.