some edits proposed by Guido