Fixed ServiceabilityAgent, added comments