Note sphinx and minor improvement