Fixed bug in per agent performance + Minor code tweaks + logging cleanup