continue fixing everyting