fix all issues