clean up; improve echo and translations;