completed with fixing of bugs in the thrree entities