fix the remaining title issues