UI tweaks.
Additional diagnostics.
remove duplicate cmake setting
Merge branch 'upstream'
remove unused char*