Completed expanding-collapsing, fixed bugs