added company and a few fixes
upgraded Rails to 3.2.12