Better multi-ant support

Made some changes so that multiple ants behave correctly