review feedback in edit and other tweaks