Fixed up some antiquated code and made echos less drab