documenation and some more renaming