rm debug
add entity instance check
version update