Fixing some rogue formatting issues
Adding a heading formatter