Documentation and fixes
Documentation and fixes