Adapted code for AbstractEntity removal

* Fixed some typos as well
Merge pull request #68 from elcodi/hotfix/adapted-code-for-abstract-entity-removal

Adapted code for AbstractEntity removal