bug fixes
remove swaps