address numerous review comments