Fixup to last commit and added documentation