Fixed all issues
Fixed all issues