Fix so that player one starts after card picking

And other small changes to try and fix things that behaved rare and
oddly.