Added variable/parameter matching and error reporting