Re-added some recent changes that got lost when the cvs repository was moved. This was mostly changes to the collector and building code