DicoverBlock (TE + GUI) part 1 + fixes