docs and missing param
simpler match check
many tests working