Added titles, fixed bugs