Fixed pk refs
Fixed html vs djhtml
Checkpoint