Entity IDs and Handling, better state switching, fixes