Small fixes
Very small changes to simulation