use disk/by-id if possibe, other small fixes