fix big + update comments