entity annotations, has entity, head fixes