Update -B usage for it to show in help and fix a few message