bugfixes, documentation fixes, scope includes