Added url validation, some todo's, minor cleanup, changed URL to url