partial review fixes