Minor codechanges and additions.