Improved simulation output
Minor changes