several tweaks on scroll mode behavior