Lots of fixes for block comment indentation