comments and some minor changes