Some tweaks, wrong tense, etc.