comments and some minor organizing