Made Multi-Tool Code More Generic/Optimatizations/Bug Fixes