Add keyed flavor.
Bug fixes.
Add test for keyed finish.