Made pkg install fns more stand-alone