Spelling issues and update

also for the rails4 branch :)