add the watch|w parameter back and unify getting that single path

Signed-off-by: Roy Storey <roy.storey@plantandfood.co.nz>
clean up

Signed-off-by: Roy Storey <roy.storey@plantandfood.co.nz>