Add usage info/error, remove ambiguity in variable names.