Fix titles and another #24 bug