Added titles and fixed minor bugs