Modified cli scripts based on feedback from sgilda.