Fixed all the condor bugs