Documentation and small bugfix