Some fixes and commenting in entity pool