A few more comments were added