More automation and other improvements...