Add swoop, ag and ack
Minor changes