added watchlist and corrected bugs