fixed documentation and other fixed from PR