TreeMapper clean-up: much better, still terrible