Improves the documentation and some small improvements of the code

Jira-issue: APPPARTY-8