tidied things up, about to move to new payload info class. added some
icons