added expand collapse
fixed up some old annoyances and styles with collapsers
polishing