Bookmarks module added
Events module
further tweaks
merge issues