Typo and minor changes suggested by Jordi