Refactoring.

Added/removed some TODOs.

Corrected help-output (now quotation marks are included in the
description).