more collapse tweaks