fixes from Zach