Bug fixes, enhancements, cleanup for knitkit