review changes/fixes