fixed the motherfucker bugs