Bugfixes + completed the docs