Incipits and various smaller fixes for rails 3