fixing all the problems