Merging more updates from the aurora-sim repository.

Signed-off-by: EmperorStarfinder <emperor@secondgalaxy.com>