Additional work on the hakpak builder, some other tweaks.