fixed misnamed objects and pulled all echoing into CLI conditional