small updates for correctness.