minor changes to allow scoring with NullState