added more urls, some other bug fixes