Final set of changes (just printed for ICOTS).