some tweaks to make tianon/dind work better :)  (ie, work at all)