Added a small window for the user to choose an entity id
Documentation and comments improved