Only small updates and changes. /EOM