more packaging changes/debugging