More documentation
Bugfixes