minor fixes: by_match is already defined, use strict equal