Minor changes; updated tool defaults