Completed collapsing/expanding, fixed bugs