just making sure I got everything
merging just to see if all my fixes are in john's; just a few bugs
start of multi-agent