Updated entitty,qtree, fixed some type or something