fix all the issues