fixes and re-organize fstab