some review fixes