Some more fixes to the PKGBUILD

Various fixes and tweaks that should go into the PKGBUILD

Still not sure on the best shimmed fix.