- more collapse/expand fixes