Luis: few moew hotfixes...blackbox still can't find a solution for 2.3 and the challange...