minor fixes, changes, and ref to jshon