Preparing for new, fully automated collector
fix variables