added back payload module, for a different purpose however
changed a single command to use new approach
fixed small bug + reformatting + parsing 'selector'