fixed filemodes
fixed comments
Merge branch 'issue-fixed-filemodes' into cute-frog-version
Merge branch 'issue-fixed-comments' into cute-frog-version