Fixed endpoints state and removed %charge column from measurements.