main: improvements after feedback from Frits