tweaks to bookmarking state
Merge pull request #98 from mr-mr/ccbranch

tweaks to bookmarking state