Some codechanges and additions.