Fixes after feedback from Padberg
State after pr1