some documentation and renaming