some more comments and final cleaning.