messed up commit
misc fixes
Merge branch 'master' of https://github.com/esalman/fplanalyzer