bookmarks fixed, pollling improved