update comments and rename some variables
update version