fixing everyting