and more rst fixes