updated Def.8 and fixed some other issues