Clean up and commenting
Minor tweaks
Merge branch 'master' into ui-experiments