All specs except fs-related now passing.  Preparing to merge.