More Documentation and fixes