Tweaks to graphing, etc.