update of variable function call + minor changes