2.02.0:zeress:2 1257 Bookmark Fix + History Fixes

- 1257 Mali Bookmark was pointing to the wrong character
- Several logic & typo fixes for history