add associations, fix title