VCS bugfix, clean up use of pkgname, general tweaks.