Added limit and better handling

It now limits itself, and handles local url betters