fixes on names, some documentation