Added better command-line parsing, and re-enabled old workload generation code (currently crashing)
A bit of code cleanup