Added Task.task_name property. Simplifies things, also fixes naming bug.
Fixed CLI options.