minor treemap cleanup + Set trait improvements