Changes during the Campus Party Santander... (@ralli @fla)

Changes during the Santandar meeting and correction of bugs...