Update module loading and docs
Merge branch 'fix-almond-loading'