Utilize the Destination class in addBookmark() and addLink(), other minor changes