fix bugs
update today spider
merge