Bugfix/improving docs