Added all available entities. FINALLY fixed issue with entities not being highlighted correctly. Now able to move on to other stuff!