comments and changes on latest from varoquaux branch