contacts and algo tweaks, ready to test rework