Revert "Small updates"

Reverts doubledead/PncForm#1