fixes to get multiple working [zach]