Final SWAPS
Minor changes
Options code