Manual improvements and minor fixes