Added functionality for tienda and fixed some minor problems