add comments, fix parameter name issues (for 4.3)