fix a bunch of stuff getting added from my last merge