Bunch of changes, docs, bugfixes...