review fixes
final review fixes