Cleaned up code a bit after adding molt probs
Merge branch 'develop' of https://github.com/seacode/gmacs into develop