Fixed more problems with the doctoring