Add bookmarks, clean automode, set truncate-lines
Merge