fix a few bugs
add to watch list feature