Replace chapter labels to convention

And remove extra blank lines
Make todo command bold