added more checks and grader now handles urls somewhat
cleanup