Commented bookmarks code for 0.4.0 release