fix all changes