docs & bugfixes from docs