defaults changed a bit

now the geometry defaults correspond exactly to the Jan's geometry
figure