fix'd zach's fuckups
thanks zach next commit redeems you