refactor training and handling of defaults
updates