More additions to framework
Learning framework additions and cleanup
Lots of cleanup to Learner, added some new functionality, fixed up FM generator