Add slight documentation and small fixes
merge fix

fix