Changed VFS again and some todos