Added a values to the message so the value can be linked to an decription
Also cleaned up the node