Fixes #1 [Missing prereqs]
Fixes #2 (more or less; add more modules)