Numerous changes to get incremental training running from the command line.