Improve output
Change default limit
Fix logic