update comments and fixed arguments delegation