fixed typesos and fixed links
Merge branch 'staging'