Making it prettier. And adding some error pcts
Merge branch 'gh-pages'