Adding task titles and some other minor fixes