more uuid use cleanup, more filesystem thread work on #14