Cambios estructurales completos
small improvements