Minor cleanup, add some nifty new settings