indent code
query optimizada con joins
list fixed
some bugs fixed