bug fixes + new url validation