some fixes and tarball creation