move more out of fstab; based on tmo stock MK2