address most review comments