add bookmarks + cleanup