Updated sim-safe.c at angus, still working on #2. Not working.