Small fixes to make more efficicent.
Merge branch 'master' of https://github.com/cpausmit/MitAna