address review comment and a few fixups