Added a couple of additional collectors and altered cpu collector slightly.