issue8851

some more

some review fixes

some more

removed a to