Doc improvements and minor fixes