Nasty Bug(s) fixed

fixed bugs that prevented it from functioning at all due to changes in
the framework itself.