Many changes; mostly eval operators