Fixed Natural Learner, Field options, minor cleanup of classes data