Add some more comments and remove some in spanish