Added variable support, fixed dupe 'v' in info