Support for "bookmarking" languages (#75)
Some minor bug fixes
