fixed problems with hand/deck count and marks after initial draw  (#397)