fix more issues

fix a few more issues, and implement what I suggested in https://github.com/HEP-Puppet/arc_ce/issues/16