Various fixes

[Daandelange]

Hey, I also have made some other improvements to Doctor. See respective commit messages for details. (Don't hesitate to modify the new text messages.) Thanks for this great plugin :)

[bnomei]

thanks @Daandelange