Changed the names of some arguments, added comments.