fix user wrapper creation + add doc-strings