cli add script support & bugs fixed