Some corrections on modules.
Still need some work to match pieces