fix all the problems