More work on clarifying certain UI functions, minor bug-fixes...