lots of cleanup, and now lists and dicts are accordions :imp: