Lots of fixes.  Starting to expand and collapse correctly.