Include double D i the thanks, and some indentation anal bits