Comments; split states into statevars and statetemps