finalized watchlist code and fixed some style issues