fixed some names & added an accessor for collector