added docu + w0 bugfix + some renaming/refactoring