trying to fix problem. did some refactoring
made requested changes to language and fixed links
fixed syntax errors
Merge branch 'hotfix-recent_changes' into development