lots of tweaks to tool and graph