Remove some debug output
Add limit parameter.