Added bookmarks support. Fixes to show usage.