Add simulation + rename variables for clarity + some cleanup