Minor tweaks
merge Zearin's edit, solve conflict.