Add title
Small improvements