Added commands to usage.
Reorder statements to make it more robust.
Fixed dot structure a little with TODOs.