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

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