removing empty state objects from full state updates and fixing viral NaN issues