Bookmark related fixes. Numerous. Still not stable.