Rework heuristic sensors (mostly pickup sensors)

* Squashed a lot of bugs but probably introduced some new ones too
* Needs tweaking still