fixes, fixes and improvements
overhaul and cleanup for new sensor:

new constants,
better avoidance function
misc