Added additional os metrics
Minor tweaks for jmx data