fixed orders in skirmish

orders were broken in skirmish so I fixed them. I also removed a
redundant return from a label