Wip fs cmds oops

These are some commits that got left off the end of the wip-fs-cmds branch during rebase.