This fixes up a few errors, and renames pc.py to be in-line with the other handlers.