Issue #2: fix error messages.
Make variable override work