// fixed some CLI issues