Changed otuput to be a little more friendly. Also, changed Generator to take experimental parameters.