commit minor changes which ococcurred while trying to prevent an error from being thrown in setState. Eventually they stopped, but I'm not sure why.
Changed paths: