Added proper URL handling and full checks file