Some cleanup, especially more cmds separated out into their own functions in fscmd.c