more buffalo commits