Several improvements to drive forward
Added negative distances