Fixed some NPEs, added an editable title