Variables in variables, a/an correction, bug fixes