Solved: adding agents at runtime
Some cleaning