Bugfixes and usage docs