cleanup
add pk rule
fix pk rules access