better partition info and swap handling