Bugfix for add module results
Update typo
Merge branch 'master' into develop
Various incomplete things