Some variable movement to new modules.
Specifically moved "gam" and "alpha", along with other minor changes like spelling in a comment.