changed around some of the framework in bookmark.js...