Bug fixes and stuff + Embelezamento do TAD