improved expansion status saving, added option to remove bookmarks