Codechanges and some additions.