Documentation added, some renaming