Correct some stuff, add UEV classes