some more comments and minor improvements