some small changes as well as updating to rails 3.2.11