Last Changes Mejenguitas

Some issues fixed