Bugfixes, disclaimer, closes #7