refactor, fixes, performance upgrades
deleted feedback factor