minor fixes
Merge branch 'master' of github.com:mfiers/mad2
merged