fitprimary mode was basically making things worse. No idea how I did not catch this before!