Fixes + Police Rework