mark some options as optional
dont try to close swap
fix same variable names
shut dd up
fix a couple typos
fix variable name generation
missed a reference to usr partition