Fixed lots of small bugs. Now looking into temp mapping approach to component matcher. Might apply elsewhere.