all issues fixed