More entity close checking.
Updated jrappy.