Fix and improve status on-branch information