packaging and bugfixes