Swapped ack for ag, added some settings, some restructuring