Direx + various small improvements