more misc fixes to puncher