[BUGFIX] Minor adjustments to wordings, variables and docs