resolved more issues

Resolved all issues by administrator