Cleaned up metric names, added process metric (more to do thou)