Removing Echoe; minor updates