Add title + minor fixes