Reverted unintentional changes for agent.h/agent.cpp again. Should be under control now.