Cleaned up a bunch of logging and changed simulation output