Misc changes in var and func description