Update Documentation and bug fix