Fixed mkfs' / data block, made dirs only get rm'd if empty