Fixes for the collector
Changes for different collector compositions
Clean up
Added text to gridspeak