Ant, pso, other fixes

Ant, PSO, other fixes