minor changes, minor tweaks
Merge origin/master