Cleaned up config and added "strategy" config option, + other small cleanup/fixes