Change `pl mod` to `mod.p`, necessary cleanups

Some extra work was necessary to get the tests to run