Manual improvements