some fixes
Merge branch 'development' of https://github.com/ahvigil/667project into development
final commit before presentation