small tweaks
Merge branch 'master' into events_sidebar
fixed spelling conflicts;
Merge remote-tracking branch 'origin/master'