final fixes + tweaks to mark as read