fixed mostly everything, still not quite complete
Merge pull request #2 from txdavidtx/instructor

fixed mostly everything, still not quite complete