Small revisions from stephan, miquel and biel.