Better documentation, bugfixes