Added Waiter stuff and fixed up some other agents