fixes more review things
more review changes