renaming and better docs