Default config updated. Other minor fixes.