2-Advanced: Small bugs corrections