Entity tool cleanup and fixes