merged bookmarks and cleaned up