#136: first batch of treemap fixes