PoliceSystem back end. refactor fixes.