code cleanups
code cleanups
fixes installation location for pkgdata