fixing some shit that was pretty fucked