Includes Guillermo comments and fixes for the last PR