Small tweaks

Added icons to differentiate commands and variables in the suggestions
list, plus other bug fixes.
Further debugging

More bug fixes, tweaks and better overall operation.