new page, fixes
new content
Merge branch 'dev'