some more improvements

parent 05828931
Pipeline #226 passed with stage
in 1 minute and 17 seconds