fixed most of the cli