Tidyup and URL testing added