fixes for rails 3.2 and added user association