fixing some cli issues