Tweaked Pickup subsystem and constants