adding more checks and added url support to grader