review fixes and changes