Bugfixes
Some docs