minor fixes and rails version bump