Finished going through agentbased, found two semi-major bugs