Clean up some debugging
Adjust config params