added some threading, modified uncorrelated mapmaker