fix more little mistakes, thanks to pellaeon again!
Merge branch 'master' into gh-pages