Changed the --predict flag to the --notrain flag for consistency.
Other small changes