Adding componentes and fixing bugs