Improve bookmark-mode for me.