some rename
some little refactoring. documentation fix