add bookmarks
fix scope errors