Reducing simulation time and fixing an initialization bug