Update with all Kirby Package fixes and minor updates/tweaks!