Fixed field associations, fixed bug with ucfirst