cleanup + fixed some bugs
Merge branch 'develop' of github.com:bendisposto/prob2 into develop