* Add further configuration options * Convert auto-swap to auto_swap. Might eventually switch to key-value pair instead.