add some docs, do some renaming