Completed command line integration and clean-up.