bookmarks work now; the options have their property fields again (safer and smaller code)