More simple changes and comments about 'eval'.