Completed.
Improved many CLI features.