Bugfix, more Documentation