Filesystem final fixes. Complete rewrite. Oy.