A Token War: Small stabilization patch

Bug fixes for potential inconsistency in saving and loading, updating data scheme.