Fíxes spike numbering and cleans up logic in BoardState