add comments, fix parameter name issue (for 4.2)