Fix variable names
accept variable-length arg lists for logical match
fix docblocs / code cleaning