More cleanup, add fsck