Changes from Alvaro

changed descriptions all over the place