allowing for limit to be disabled
minor changes to the match