NEW FUNCTIONALITY: Module Rewriter - Bug Fixes