more comments, plus some indentation fixlets
more comments