Fixup/add documentation