Gargouti Simulator: New Update

Fix issues