join support for sphinx and misc tweaks