some renaming of functions to make them more readable
fix master resource expansion to trim spaces for the cell strings
AssistantExt (with libs) version 0.3.27