Swap

Dunno why the swap-handling code was removed... This brings it back, slightly different than two years ago, and I don't mean better :P, as I noticed that:

+  non-partition swaps where ignored--and thus the tomb creation would run as if they were not there.
+  multiple swaps would break the code