Bpipe edit

Bpipe stages tweaks