integration changes and updates
arreglando controlador comment
MERGE from branch frontend