Correct typo in comment, some tuning (need more work).