- And other small fixes after merge
Took 50 seconds
- In preparation for adding single and sequential swap methods.