Revisions:  some fixes and cleanups to nibblegen