Edit doc
Bugfixes