Fix error and update comments